feat(runway): add merge-conflict check wire contract and topic keys#244
Open
behinddwalls wants to merge 1 commit into
Open
feat(runway): add merge-conflict check wire contract and topic keys#244behinddwalls wants to merge 1 commit into
behinddwalls wants to merge 1 commit into
Conversation
This was referenced Jun 15, 2026
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
b8f3e22 to
ddbb5ab
Compare
## Summary ### Why? The merge-conflict check is moving out of SubmitQueue's `validate` stage into an asynchronous round-trip with a separate service, runway. Runway owns the two cross-service queues, their topic keys, and the wire contract — SubmitQueue cannot read runway's storage and vice versa, so the payloads must carry full data, not entity IDs. This change adds only those runway-owned definitions; runway's gateway/orchestrator/controllers are out of scope. ### What? Adds a new `runway/` domain folder holding contract-only definitions: `runway/entity` — `MergeConflictCheckRequest` (client-owned `ID`, `QueueName`, ordered `[]MergeStep`), `MergeStep` (`StepID`, `[]change.Change`, `mergestrategy.MergeStrategy`), and `MergeConflictCheckResult` (`ID`, `Mergeable`, `Reason`, `[]StepConflict`), with JSON `ToBytes`/`FromBytes`. The ordered step list encodes base-layering so one check expresses both "candidate vs target branch" (one step) and "candidate + in-flight vs target" (N steps). It imports only the shared `entity/change` and `entity/mergestrategy` — never `submitqueue/entity`. `runway/core/topickey` — `TopicKeyMergeConflictCheck` (`merge-conflict-checker`) and `TopicKeyMergeConflictCheckSignal` (`merge-conflict-checker-signal`). ## Test Plan ✅ `bazel test //runway/...` (round-trip serialization tests pass) ✅ `bazel build //...`
behinddwalls
force-pushed
the
preetam/runway-contract
branch
from
ddbb5ab to
edf7ab9
Compare
behinddwalls
force-pushed
the
preetam/mergestrategy-promote
branch
from
20db3b8 to
bf357a5
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Why?
The merge-conflict check is moving out of SubmitQueue's
validatestage into an asynchronous round-trip with a separate service, runway. Runway owns the two cross-service queues, their topic keys, and the wire contract — SubmitQueue cannot read runway's storage and vice versa, so the payloads must carry full data, not entity IDs. This change adds only those runway-owned definitions; runway's gateway/orchestrator/controllers are out of scope.What?
Adds a new
runway/domain folder holding contract-only definitions:runway/entity—MergeConflictCheckRequest(client-ownedID,QueueName, ordered[]MergeStep),MergeStep(StepID,[]change.Change,mergestrategy.MergeStrategy), andMergeConflictCheckResult(ID,Mergeable,Reason,[]StepConflict), with JSONToBytes/FromBytes. The ordered step list encodes base-layering so one check expresses both "candidate vs target branch" (one step) and "candidate + in-flight vs target" (N steps). It imports only the sharedentity/changeandentity/mergestrategy— neversubmitqueue/entity.runway/core/topickey—TopicKeyMergeConflictCheck(merge-conflict-checker) andTopicKeyMergeConflictCheckSignal(merge-conflict-checker-signal).Test Plan
✅
bazel test //runway/...(round-trip serialization tests pass)✅
bazel build //...Stack